--- ./lib/accountliststore.py.orig	2013-06-01 12:36:03.000000000 +0000
+++ ./lib/accountliststore.py	2014-07-14 18:52:24.000000000 +0000
@@ -1,3 +1,5 @@
+import sys
+
 from gi.repository import GdkPixbuf
 
 from utils.liststorebase import ListStoreBase, SaveListStoreBase
@@ -7,6 +9,9 @@
 from plugins.facebook.account import AuthorizedFacebookAccount
 from plugins.tumblr.account import AuthorizedTumblrAccount
 
+_encoding = sys.getfilesystemencoding()
+if _encoding is None:
+    _encoding = 'utf-8'
 
 class AccountColumn(object):
 
@@ -68,8 +73,8 @@
 
     def _get_matched_account(self, source, userid):
         for i, row in enumerate(self):
-            if row[AccountColumn.SOURCE].decode('utf-8') == source and \
-                    row[AccountColumn.ID].decode('utf-8') == userid:
+            if row[AccountColumn.SOURCE].decode(_encoding) == source and \
+                    row[AccountColumn.ID].decode(_encoding) == userid:
                 return i, row[AccountColumn.ACCOUNT]
         
         return None, None
